bitkeeper revision 1.1389.1.49 (4283701cNLgzy29rE9Sw2-Jbp4DdZA)

Remove 'exec_domain' from Xen public interfaces. Replace with 'vcpu'.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index ed0149c60d8950a7d67db41ca3b8a34dad66935e..345af149f212e7470100e1c009c8eb67910a2693 100644 (file)
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -91,8 +91,8 @@ int xc_domain_pincpu(int xc_handle,
 {
     dom0_op_t op;
     op.cmd = DOM0_PINCPUDOMAIN;
-    op.u.pincpudomain.domain = (domid_t)domid;
-    op.u.pincpudomain.exec_domain = vcpu;
+    op.u.pincpudomain.domain  = (domid_t)domid;
+    op.u.pincpudomain.vcpu    = vcpu;
     op.u.pincpudomain.cpumap  = cpumap;
     return do_dom0_op(xc_handle, &op);
 }
@@ -156,8 +156,8 @@ int xc_domain_get_vcpu_context(int xc_handle,
 
     op.cmd = DOM0_GETVCPUCONTEXT;
     op.u.getvcpucontext.domain = (domid_t)domid;
-    op.u.getvcpucontext.exec_domain = (u16)vcpu;
-    op.u.getvcpucontext.ctxt = ctxt;
+    op.u.getvcpucontext.vcpu   = (u16)vcpu;
+    op.u.getvcpucontext.ctxt   = ctxt;
 
     if ( (ctxt != NULL) &&
          ((rc = mlock(ctxt, sizeof(*ctxt))) != 0) )

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index 364453190dd305e0dd94258ee72f78c9cc668ed7..84e99e9457f4a8d06dee9674dfdac73e1cebaa32 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -457,9 +457,9 @@ int xc_linux_build(int xc_handle,
 
     memset( &launch_op, 0, sizeof(launch_op) );
 
-    launch_op.u.setdomaininfo.domain   = (domid_t)domid;
-    launch_op.u.setdomaininfo.exec_domain = 0;
-    launch_op.u.setdomaininfo.ctxt = ctxt;
+    launch_op.u.setdomaininfo.domain = (domid_t)domid;
+    launch_op.u.setdomaininfo.vcpu   = 0;
+    launch_op.u.setdomaininfo.ctxt   = ctxt;
 
     launch_op.cmd = DOM0_SETDOMAININFO;
     rc = do_dom0_op(xc_handle, &launch_op);

diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c
index 6442e3926af2cdc7a2e9a3adc512f6c02ba52f7d..5374ffd3a54839e83d15a59d05854ef6a134b4de 100644 (file)
--- a/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@ -634,9 +634,9 @@ int xc_linux_restore(int xc_handle, XcIOContext *ioctxt)
     xcio_info(ioctxt, "Domain ready to be built.\n");
 
     op.cmd = DOM0_SETDOMAININFO;
-    op.u.setdomaininfo.domain   = (domid_t)dom;
-    op.u.setdomaininfo.exec_domain   = 0;
-    op.u.setdomaininfo.ctxt = &ctxt;
+    op.u.setdomaininfo.domain = (domid_t)dom;
+    op.u.setdomaininfo.vcpu   = 0;
+    op.u.setdomaininfo.ctxt   = &ctxt;
     rc = do_dom0_op(xc_handle, &op);
 
     if ( rc != 0 )

diff --git a/tools/libxc/xc_plan9_build.c b/tools/libxc/xc_plan9_build.c
index ab8886a5d328662076102a3c04ab7be7795cb9cf..bfa5ccdf33fb1f074b728694af2062b530a2d502 100644 (file)
--- a/tools/libxc/xc_plan9_build.c
+++ b/tools/libxc/xc_plan9_build.c
@@ -543,7 +543,7 @@ xc_plan9_build(int xc_handle,
        memset(&launch_op, 0, sizeof (launch_op));
 
        launch_op.u.setdomaininfo.domain = (domid_t) domid;
-       launch_op.u.setdomaininfo.exec_domain = 0;
+       launch_op.u.setdomaininfo.vcpu   = 0;
        //  launch_op.u.setdomaininfo.num_vifs = 1;
        launch_op.u.setdomaininfo.ctxt = ctxt;
        launch_op.cmd = DOM0_SETDOMAININFO;

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index 550989e3e0109e0d70a0e2c5e5e688d49d37a274..0645af7a91651ffee8b932e71784e366f21bb7f7 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -175,8 +175,8 @@ long long xc_domain_get_cpu_usage( int xc_handle, domid_t domid, int vcpu )
 
     op.cmd = DOM0_GETVCPUCONTEXT;
     op.u.getvcpucontext.domain = (domid_t)domid;
-    op.u.getvcpucontext.exec_domain = (u16)vcpu;
-    op.u.getvcpucontext.ctxt = NULL;
+    op.u.getvcpucontext.vcpu   = (u16)vcpu;
+    op.u.getvcpucontext.ctxt   = NULL;
     if ( (do_dom0_op(xc_handle, &op) < 0) )
     {
         PERROR("Could not get info on domain");

diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
index ca051fab97bab62cfe46169ee6addcf5dc581359..f465f1e0856b4dce22ff6b455d7be5999ba711ee 100644 (file)
--- a/tools/libxc/xc_ptrace.c
+++ b/tools/libxc/xc_ptrace.c
@@ -311,8 +311,8 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata)
        op.cmd = DOM0_SETDOMAININFO;
        SET_XC_REGS(((struct gdb_regs *)data), ctxt[VCPU].user_regs);
        op.u.setdomaininfo.domain = domid;
-       /* XXX need to understand multiple exec_domains */
-       op.u.setdomaininfo.exec_domain = cpu;
+       /* XXX need to understand multiple vcpus */
+       op.u.setdomaininfo.vcpu = cpu;
        op.u.setdomaininfo.ctxt = &ctxt[cpu];
        retval = do_dom0_op(xc_handle, &op);
        if (retval)
@@ -340,7 +340,7 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata)
        ctxt[VCPU].user_regs.eflags |= PSL_T;
        op.cmd = DOM0_SETDOMAININFO;
        op.u.setdomaininfo.domain = domid;
-       op.u.setdomaininfo.exec_domain = 0;
+       op.u.setdomaininfo.vcpu = 0;
        op.u.setdomaininfo.ctxt = &ctxt[cpu];
        retval = do_dom0_op(xc_handle, &op);    
        if (retval) {
@@ -357,7 +357,7 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata)
                ctxt[cpu].user_regs.eflags &= ~PSL_T;
                op.cmd = DOM0_SETDOMAININFO;
                op.u.setdomaininfo.domain = domid;
-               op.u.setdomaininfo.exec_domain = cpu;
+               op.u.setdomaininfo.vcpu = cpu;
                op.u.setdomaininfo.ctxt = &ctxt[cpu];
                retval = do_dom0_op(xc_handle, &op);    
                if (retval) {

diff --git a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c
index 32c9a14786e62539cbb43a2795791b780d02d4d3..1edb8dc9977ca3be2129375c43d2b2373d1c9011 100644 (file)
--- a/tools/libxc/xc_vmx_build.c
+++ b/tools/libxc/xc_vmx_build.c
@@ -623,9 +623,9 @@ int xc_vmx_build(int xc_handle,
 
     memset( &launch_op, 0, sizeof(launch_op) );
 
-    launch_op.u.setdomaininfo.domain   = (domid_t)domid;
-    launch_op.u.setdomaininfo.exec_domain = 0;
-    launch_op.u.setdomaininfo.ctxt = ctxt;
+    launch_op.u.setdomaininfo.domain = (domid_t)domid;
+    launch_op.u.setdomaininfo.vcpu   = 0;
+    launch_op.u.setdomaininfo.ctxt   = ctxt;
 
     launch_op.cmd = DOM0_SETDOMAININFO;
     rc = do_dom0_op(xc_handle, &launch_op);

diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h
index 734b7c56678c8f0b5f31342a60832c06e3be2c14..430244d220bf0a4005796017f8c91bd48cd4cfb5 100644 (file)
--- a/xen/include/public/dom0_ops.h
+++ b/xen/include/public/dom0_ops.h
@@ -95,7 +95,7 @@ typedef struct {
 typedef struct {
     /* IN variables. */
     domid_t                   domain;
-    u16                       exec_domain;
+    u16                       vcpu;
     /* IN/OUT parameters */
     vcpu_guest_context_t *ctxt;
 } dom0_setdomaininfo_t;
@@ -171,13 +171,13 @@ typedef struct {
 } dom0_readconsole_t;
 
 /* 
- * Set which cpus an exec_domain can use
+ * Set which physical cpus a vcpu can execute on.
  */
 #define DOM0_PINCPUDOMAIN     20
 typedef struct {
     /* IN variables. */
     domid_t      domain;
-    u16          exec_domain;
+    u16          vcpu;
     cpumap_t     *cpumap;
 } dom0_pincpudomain_t;
 
@@ -346,7 +346,7 @@ typedef struct {
 #define DOM0_GETVCPUCONTEXT      37
 typedef struct {
     domid_t domain;                   /* domain to be affected */
-    u16     exec_domain;              /* vcpu # */
+    u16     vcpu;                     /* vcpu # */
     vcpu_guest_context_t *ctxt;       /* NB. IN/OUT variable. */
     u64     cpu_time;                 
 } dom0_getvcpucontext_t;